Removed workaround and added execute method