Added support fro broken bike and removed redundant properties