Avoid using constants in model

Change-Id: I17e9a9936de5912dcd8d37aab33bb4da5659d724
Signed-off-by: Yaniv Bronhaim <ybronhei@redhat.com>