Removed need for strict typing