Removed regexp as a dependency for the main lib