Removed numeric dependency