Added library and business logic