Added additional logic to build method