Eliminate Template Requirement