Removed usage of Symbol class