Simplify development code part