Added a few more instruction support and test