Refactored obsolete things in module
Fixed issue with empty values