Refactored named groups
Bug fixes