Convenience constructors added / General refactoring