Feature/some enhancements